wayland: Use the correct union member for axis events
authorRob Bradford <rob@linux.intel.com>
Mon, 16 Jul 2012 14:36:40 +0000 (15:36 +0100)
committerRob Bradford <rob@linux.intel.com>
Mon, 16 Jul 2012 14:38:09 +0000 (15:38 +0100)
Otherwise we end up overriding other members of the struct (in this case the
device pointer) and generate an error.

gdk/wayland/gdkdevice-wayland.c

index f1698b3996f686209f8b4a187a311747b5027ee6..4054dc2cf6acbae89194845e7ffa1ec434bc2380 100644 (file)
@@ -1139,7 +1139,7 @@ pointer_handle_axis (void              *data,
   event->scroll.direction = GDK_SCROLL_SMOOTH;
   event->scroll.delta_x = delta_x;
   event->scroll.delta_y = delta_y;
-  event->button.state = device->modifiers;
+  event->scroll.state = device->modifiers;
   gdk_event_set_screen (event, display->screen);
 
   GDK_NOTE (EVENTS,